https://issues.apache.org/jira/browse/MNG-6311

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

https://issues.apache.org/jira/browse/MNG-6311

Karl Heinz Marbaise-3
Hi Sylwester,

as you wrote the IT's are fine and now you can merge that branch back to
master. Just to be sure check the master if something has came into
master ...and make a rebase against master...(I expect that you don't
get something).

If you get something new to the rebase and make a push with a
--force-with-lease to your branch and let the CI check this new
state..afterwards redo the loop from the beginning...

And finally you should get a simple fast forward while merging into
master...

And afterwards you can close the ticket as done (delete the remote
branch and your local one). Best would be to add the reference to the
git commit within the ticket.

Kind regards
Karl Heinz Marbaise

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]