search

roboticslab-uc3m / xgnitive

Research on algorithms for Continuous Goal-Directed Actions (CGDA), Robot Imagination System (RIS)...
http://robots.uc3m.es/dox-xgnitive/
GNU Lesser General Public License v2.1
5 stars 1 forks source link

clean branches #60

Open jgvictores opened 5 years ago

jgvictores commented 5 years ago

clean branches: cannot be merged automatically

jgvictores commented 5 years ago

Blocked by #55

RaulFdzbis commented 5 years ago

Update: I tried to do a local merge between develop and master and worked, should i make a push to the remote?

PeterBowman commented 5 years ago

The master branch only differs in two merge commits from develop, so you could as well either delete it and create anew or force push from current develop.

RaulFdzbis commented 5 years ago

From master: "This branch is 2 commits ahead, 416 commits behind develop."

That's more than two commits hahaha

PeterBowman commented 5 years ago

Nope, that's exactly two commits if your base branch is develop. Those commits are meaningless in this comparison since both come from develop anyway, thus merging develop into master means you can start a new master branch on top of develop with little or no harm (okay, you are rewriting the commit history on a shared repo, but IMO it can be assumed given how the network graph for master branch looks like).

RaulFdzbis commented 5 years ago

Ok, now I understand your point, and yeah looks fine to me to delete the master branch and create a new one in develop, that can help reduce the mess in the network :D

RaulFdzbis commented 5 years ago

Done

PeterBowman commented 4 years ago

Today, develop has been merged into master because of https://github.com/roboticslab-uc3m/questions-and-answers/issues/88.