latest 20 messages by t4nk913

+ [2015-08-21T01:33:56Z] t4nk913 VxJasonxV: merging reversed master into B does delete B's files... no good
+ [2015-08-21T01:13:19Z] t4nk913 VxJasonxV: This method creates conflicts when merging master back into branch B
+ [2015-08-21T00:55:22Z] t4nk913 VxJasonxV: I have set up a new repo now just to test that solution
+ [2015-08-21T00:41:36Z] t4nk913 So this is what you would do to fix it?
+ [2015-08-21T00:39:54Z] t4nk913 merging master into B is perfectly safe to B's files?
+ [2015-08-21T00:39:42Z] t4nk913 Yes, so reverting the merge WON'T affect branch B's ability to merge master into itself?
+ [2015-08-21T00:38:55Z] t4nk913 bad merge to origin
+ [2015-08-21T00:38:31Z] t4nk913 without actually deleting any files from branch B
+ [2015-08-21T00:38:24Z] t4nk913 and I'm trying to undo that
+ [2015-08-21T00:37:47Z] t4nk913 a remote branch B was merged into branch A and pushed to master, which was wrong
+ [2015-08-21T00:37:20Z] t4nk913 I want all changes from the merge to be OUT of master, and for branch B to be perfectly safe to merge into and from
+ [2015-08-21T00:36:41Z] t4nk913 If I reset master to the last good commit, it will show as being some 40 commits behind (due to the bad merge). If I reverse the merge, it will show as being 1 ahead
+ [2015-08-21T00:34:59Z] t4nk913 For all branches and merging
+ [2015-08-21T00:34:45Z] t4nk913 So reverting master back to the last stable commit is perfectly safe?
+ [2015-08-21T00:33:08Z] t4nk913 but what I fear will happen is that when master is then merged into branch B (with reverse commit), that files from branch B will be removed because they were removed from master
+ [2015-08-21T00:32:31Z] t4nk913 and then I merged that into branch A
+ [2015-08-21T00:32:24Z] t4nk913 Yes, I have done that
+ [2015-08-21T00:32:10Z] t4nk913 so revert the merge commit from B into A on branch A (branch B is unaffected atm)
+ [2015-08-21T00:31:17Z] t4nk913 and without rewriting history