Dear Simon, 1. Track deal.II's remote master branch git remote add dealii [email protected]:dealii/dealii.git
2. Fetch the up-to-date master from the deal.II remote git fetch dealii 3. Merge or rebase as necessary: git merge dealii/master or git rebase master In all likelihood "rebasing" is the best way to go here. This means that your patches are applied on top of those already in deal.II's master branch, and will make getting them committed to the main branch much easier when you finally open a pull request. If there are any conflicts then you'll need to resolve them using "git mergetool". I hope that this helps! J-P On Thursday, July 6, 2017 at 2:56:38 PM UTC+2, [email protected] wrote: > > Hello all > > Thanks a lot for your replies. I managed to submit a pull request (the > video lecture was quite helpful). I hope I did it right, otherwise I'm > happy for feedback. > > I will try to implement the error computation using Daniels suggestions. > > Now a follow-up question regarding development with git: How do I keep my > own fork up to date with the deal.ii master branch? Since I forked it last > Tuesday I am now several commits behind. > I found this <https://help.github.com/articles/syncing-a-fork/> in the > official github help. Is this the way to do it? > > Best, > Samuel > > On Wednesday, June 28, 2017 at 12:08:12 PM UTC+2, Wolfgang Bangerth wrote: >> >> On 06/26/2017 07:12 AM, [email protected] wrote: >> > >> > Thanks for your answer, your approach actually worked quite well. (How >> would I >> > go about submitting a patch? I have absolutely no experience with these >> things) >> >> In addition to the link Daniel already shared, here's also a video that >> shows >> how this is done in practice -- take a look at lecture 32.8: >> http://www.math.colostate.edu/~bangerth/videos.html >> If you don't quite know how git works, check out lecture 32.75. >> >> We really do appreciate everyone's contributions. It would be great if >> you >> could submit a patch for what you have, and we'll be very happy to walk >> you >> through the process! >> >> Cheers >> Wolfgang >> >> -- >> ------------------------------------------------------------------------ >> Wolfgang Bangerth email: [email protected] >> www: http://www.math.colostate.edu/~bangerth/ >> >> -- The deal.II project is located at http://www.dealii.org/ For mailing list/forum options, see https://groups.google.com/d/forum/dealii?hl=en --- You received this message because you are subscribed to the Google Groups "deal.II User Group" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
