Timeline for Move branch head to another commit
Current License: CC BY-SA 3.0
8 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Jul 1, 2015 at 15:10 | comment | added | Raymond Chen |
git merge master does not merge master into develop. It merges master into your current branch. The OPs' problem is that the wrong branch is current. Your solution doesn't solve that.
|
|
| Jul 1, 2015 at 15:07 | history | edited | TheGeorgeous | CC BY-SA 3.0 |
deleted 8 characters in body
|
| Jul 1, 2015 at 15:02 | comment | added | Raymond Chen |
git merge develop master does not mean "Merge master into develop". It means "merge develop and master into my current branch." If your current branch is develop, then this is a nop.
|
|
| Jul 1, 2015 at 13:50 | comment | added | wadge | Nop, even in upstream it gave the same message. | |
| Jul 1, 2015 at 13:38 | comment | added | TheGeorgeous | maybe you did it while in master | |
| Jul 1, 2015 at 13:35 | comment | added | wadge | Doing this gives me: "Already up to date" as described in the OP. | |
| Jul 1, 2015 at 12:19 | review | Low quality answers | |||
| Jul 1, 2015 at 12:40 | |||||
| Jul 1, 2015 at 12:02 | history | answered | TheGeorgeous | CC BY-SA 3.0 |