You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@flex.apache.org by Josh Tynjala <jo...@gmail.com> on 2017/03/23 22:25:49 UTC
Re: [50/50] git commit: [flex-falcon] [refs/heads/master] - Merge
branch 'master' of https://git-wip-us.apache.org/repos/asf/flex-falcon
Apparently, I merged some commits into master instead of develop, and I
think it brought master up to date with develop. Anyone know how to roll
back that kind of thing?
- Josh
On Tue, Mar 21, 2017 at 4:11 PM, <jo...@apache.org> wrote:
> Merge branch 'master' of https://git-wip-us.apache.org/
> repos/asf/flex-falcon
>
>
> Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
> Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/22d17c8d
> Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/22d17c8d
> Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/22d17c8d
>
> Branch: refs/heads/master
> Commit: 22d17c8d447c22fb75a4063ad5b01879a9f08b7d
> Parents: f39511d 6b2d674
> Author: Josh Tynjala <jo...@apache.org>
> Authored: Tue Mar 21 16:07:47 2017 -0700
> Committer: Josh Tynjala <jo...@apache.org>
> Committed: Tue Mar 21 16:07:47 2017 -0700
>
> ----------------------------------------------------------------------
>
> ----------------------------------------------------------------------
>
>
>
Re: [50/50] git commit: [flex-falcon] [refs/heads/master] - Merge
branch 'master' of https://git-wip-us.apache.org/repos/asf/flex-falcon
Posted by Alex Harui <ah...@adobe.com>.
I'd say don't bother. We need to get a release out soon anyway.
-Alex
On 3/23/17, 3:25 PM, "Josh Tynjala" <jo...@gmail.com> wrote:
>Apparently, I merged some commits into master instead of develop, and I
>think it brought master up to date with develop. Anyone know how to roll
>back that kind of thing?
>
>- Josh
>
>On Tue, Mar 21, 2017 at 4:11 PM, <jo...@apache.org> wrote:
>
>> Merge branch 'master' of
>>https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit-wip-
>>us.apache.org%2F&data=02%7C01%7C%7C0ba845aac3ae413bbb3c08d4723babc6%7Cfa7
>>b1b5a7b34438794aed2c178decee1%7C0%7C0%7C636259047985005863&sdata=ZcO6eNkI
>>MVMRK%2FjvAQb7890n3twK5guyLUcdKI9LAic%3D&reserved=0
>> repos/asf/flex-falcon
>>
>>
>> Project:
>>https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit-wip-u
>>s.apache.org%2Frepos%2Fasf%2Fflex-falcon%2Frepo&data=02%7C01%7C%7C0ba845a
>>ac3ae413bbb3c08d4723babc6%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C63
>>6259047985015867&sdata=%2BPsr0OWtIjvfN7AJbd5ACxWF7NQIMMCLJN5urerxiUk%3D&r
>>eserved=0
>> Commit:
>>https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit-wip-u
>>s.apache.org%2Frepos%2Fasf%2Fflex-falcon%2Fcommit%2F22d17c8d&data=02%7C01
>>%7C%7C0ba845aac3ae413bbb3c08d4723babc6%7Cfa7b1b5a7b34438794aed2c178decee1
>>%7C0%7C0%7C636259047985015867&sdata=Z9bnhasetrmQRUCpUWkt4XPGTr5DFB%2FboRZ
>>UtiGjszk%3D&reserved=0
>> Tree:
>>https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit-wip-u
>>s.apache.org%2Frepos%2Fasf%2Fflex-falcon%2Ftree%2F22d17c8d&data=02%7C01%7
>>C%7C0ba845aac3ae413bbb3c08d4723babc6%7Cfa7b1b5a7b34438794aed2c178decee1%7
>>C0%7C0%7C636259047985015867&sdata=y8KXYQ4av62ghUoCg5tWNh9%2BcRZjpa%2B6eUy
>>SIyLu%2F%2BQ%3D&reserved=0
>> Diff:
>>https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit-wip-u
>>s.apache.org%2Frepos%2Fasf%2Fflex-falcon%2Fdiff%2F22d17c8d&data=02%7C01%7
>>C%7C0ba845aac3ae413bbb3c08d4723babc6%7Cfa7b1b5a7b34438794aed2c178decee1%7
>>C0%7C0%7C636259047985015867&sdata=mb%2FY%2FjMULNgsZqsKKmVK793vO1Kvmlvnder
>>%2Bw%2BWq7x4%3D&reserved=0
>>
>> Branch: refs/heads/master
>> Commit: 22d17c8d447c22fb75a4063ad5b01879a9f08b7d
>> Parents: f39511d 6b2d674
>> Author: Josh Tynjala <jo...@apache.org>
>> Authored: Tue Mar 21 16:07:47 2017 -0700
>> Committer: Josh Tynjala <jo...@apache.org>
>> Committed: Tue Mar 21 16:07:47 2017 -0700
>>
>> ----------------------------------------------------------------------
>>
>> ----------------------------------------------------------------------
>>
>>
>>