Yade

merge request on gitlab

Asked by Raphaël Maurin

Hi all,

I have not been doing any commit since we moved to gitlab and I am not completely sure I understand how to do it properly. I followed the tutorial on yade website (https://yade-dem.org/doc/gitrepo.html#yade-gitrepo-label) but then I do not understand how I should do once I made a commit. Should I "push on yade-dev" or "Push to personnal repository" ? Or should I ask a merge request ? As a member of Yade-dev or as a new developper ?

I am sure my questions are rather basic but I prefer to have your opinion before instead of making a mistake directly !
Thanks in advance for you advices !

Raphaël

Question information

Language:
English Edit question
Status:
Solved
For:
Yade Edit question
Assignee:
No assignee Edit question
Solved by:
Raphaël Maurin
Solved:
Last query:
Last reply:
Revision history for this message
Robert Caulk (rcaulk) said : 		#1

Hello,

Push to yade-dev a new branch:

git branch localBranch
git checkout localBranch
git add path/to/new/file.cpp #Version a newly created file
git commit path/to/new_or_modified/file.cpp -m 'Commit message' #stage (register) change in the local repository
git pull --rebase upstream master #get updated version of sources from yade-dev repo and apply your commits on the top of them
git push upstream localBranch:newlyCreatedBranch #Push all commits to a new remote branch.

Then you can login to gitlab and see that it suggests you to "create a merge request" with the newly pushed branch.

Cheers,

Robert

Revision history for this message
Jérôme Duriez (jduriez) said : 		#2

Since you're not yet here: https://gitlab.com/groups/yade-dev/-/group_members
I think you would also need to ask (Bruno ?) to make you a member, after precising your gitlab id.

Revision history for this message
Raphaël Maurin (raphael-maurin) said : 		#3

Thank you both for your answers, I will send an email to Bruno and then process as Robert suggested.
Best,
Raphaël