purplecat (![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
purplecat) wrote in ![[site community profile]](https://www.dreamwidth.org/img/comm_staff.png)
dw_dev_training2013-10-30 09:31 pm
purplecat) wrote in dw_dev_training2013-10-30 09:31 pm
Entry tags:
Git Logs and Merging develop into a branch
I'm about to push my latest bug fix to github. While I've been working on this bug there's been some changes to the main develop branch so, obviously, I want to merge these into my branch before I push my code and submit a pull request.
Now I recall that in the past I've been asked to clean up the log after doing this but I've forgotten the process for achieving that. If someone could post an idiots' guide in the comments that would be really useful!
Now I recall that in the past I've been asked to clean up the log after doing this but I've forgotten the process for achieving that. If someone could post an idiots' guide in the comments that would be really useful!