[Solved] Git commands for the following use cases (revert / reset, etc)

Question

You could try the Git Documentation or the Git Reference Page. These are all pretty standard use cases.

1), 2) and 3) are standard use cases.

4) Use a file comparison tool like Kdiff3 to merge the two files together. There is a Massive amount of choice.

5) Revert a.java then merge b.java as per 4).

6) Cancel your push, pull from the server, resolve as per 4), and then push the merged files.

Accepted Answer

You could try the Git Documentation or the Git Reference Page. These are all pretty standard use cases.

1), 2) and 3) are standard use cases.

4) Use a file comparison tool like Kdiff3 to merge the two files together. There is a Massive amount of choice.

5) Revert a.java then merge b.java as per 4).

6) Cancel your push, pull from the server, resolve as per 4), and then push the merged files.