Update Wiki to include common GitHub pitfalls for this style of Git flow

Buster-Darragh-Major commented 5 years ago

I've noticed there are some small common issues and misunderstandings I and others have experienced with the fork/rebase paradigm so I'd like to add in some few minor details to help developers check whether they have a correctly set up git environment to easily apply these commands, as well as roll back mistakes safely. Will include screenshots.

Some common issues to add include people's origin fetch url being incorrect, faulty reverting and some general helpful pointers on setting up the git environment so commands are as easy as possible to execute! 😄

Acceptance Criteria

Wiki has new useful information relating to what is outlined above, Refer to comments for files changed

Files changed

Git Flow (Under revision [#126- ] Add instuctions on fixing faulty rebases)
Git Setup (Under revision #126 - Add instructions for fixing faulty rebases)

cyrus-raitava commented 5 years ago

I approve of this! Could be massively helpful.

KelseyRM commented 5 years ago

Yes please much approved

aorthi commented 5 years ago

Approved :)

Buster-Darragh-Major commented 5 years ago

Review

Files changed in wiki edit:

Git Flow (Under revision [#126- ] Add instuctions on fixing faulty rebases)
Git Setup (Under revision #126 - Add instructions for fixing faulty rebases)

Please comment Have read, approved or something similar if you approve, and close the issue.

cyrus-raitava commented 5 years ago

Have read: Great work @Buster-Darragh-Major - I would potentially suggest putting a line at the top of Git Flow, in regards to making sure to read Git Setup prior (so they don't have to muck around with git reflog unnecessarily). Other than that, it's looking superb!

Buster-Darragh-Major commented 5 years ago

Have read: Great work @Buster-Darragh-Major - I would potentially suggest putting a line at the top of Git Flow, in regards to making sure to read Git Setup prior (so they don't have to muck around with git reflog unnecessarily). Other than that, it's looking superb!

Have done so now @cyrus-raitava

cyrus-raitava commented 5 years ago

Great, in that case, this issue can be closed. Great work!

kblincoe / VisualGit_SE701_2019_1