You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
@thejayps accidentally made commits with incorrect messages on master by following proc.merge.pull-request because he committed after resolving conflicts, not realising that would commit to master.
We can make three improvements:
We could encourage the use of catch-up merges from master to resolve conflict.
We can warn people not to commit when resolving conflicts from the merge until they are tested, since this changes master.
We could tell people to eyeball the log of master before pushing, e.g. with git log -n 3 --first-parent master
The text was updated successfully, but these errors were encountered:
@thejayps accidentally made commits with incorrect messages on master by following proc.merge.pull-request because he committed after resolving conflicts, not realising that would commit to master.
We can make three improvements:
git log -n 3 --first-parent master
The text was updated successfully, but these errors were encountered: