<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<div class="moz-cite-prefix">Am 04.07.20 um 10:57 schrieb Prasun
Kumar:<br>
</div>
<blockquote type="cite"
cite="mid:CAM9DqsKVdUgNr-KsP9wC2wAUKUyFZfqXtWVdWrPm6ii8iOtT6A@mail.gmail.com">
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<div dir="ltr">
<div>Thank you for this advice. Although, before rebasing, I did
some searching and found about this rule. <br>
</div>
<div>As I understood, since no one has done any work based on my
commits yet, it was safe to do the rebasing.</div>
<div>Please correct me if I am wrong as I have not used git
rebase before.</div>
</div>
</blockquote>
<p>We specified the branch, where the GSOC stuff is added, as
feature branch (explained for example at
<a class="moz-txt-link-freetext" href="https://bocoup.com/blog/git-workflow-walkthrough-feature-branches">https://bocoup.com/blog/git-workflow-walkthrough-feature-branches</a>).</p>
<p>While working on a feature branch, the branch it is based on may
receive additional commits and may require you to update the
feature branch to stay current. This is especially true when
working on a feature branch for a long time.<br>
</p>
<p>Regards</p>
<p>Ralf</p>
<blockquote type="cite"
cite="mid:CAM9DqsKVdUgNr-KsP9wC2wAUKUyFZfqXtWVdWrPm6ii8iOtT6A@mail.gmail.com">
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Sat, 4 Jul 2020 at 10:42,
Thomas Baumgart <<a href="mailto:thb@net-bembel.de"
moz-do-not-send="true">thb@net-bembel.de</a>> wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div
style="font-family:"Monospace";font-size:10pt;font-weight:400;font-style:normal">
<p style="margin:0px;text-indent:0px">On Freitag, 3. Juli
2020 15:23:39 CEST Prasun Kumar wrote:</p>
<p style="margin:0px;text-indent:0px"> </p>
<p style="margin:0px;text-indent:0px">> ></p>
<p style="margin:0px;text-indent:0px">> > I added a
related "removing trailing space" commit to master branch.
You</p>
<p style="margin:0px;text-indent:0px">> > can rebase
your branch on upstream master to get this changes merged</p>
<p style="margin:0px;text-indent:0px">> > into your
branch by using</p>
<p style="margin:0px;text-indent:0px">> ></p>
<p style="margin:0px;text-indent:0px">> > git fetch
origin</p>
<p style="margin:0px;text-indent:0px">> > git rebase
origin/master</p>
<p style="margin:0px;text-indent:0px">> ></p>
<p style="margin:0px;text-indent:0px">> </p>
<p style="margin:0px;text-indent:0px">> Done. Thanks for
the help with merging.</p>
<p style="margin:0px;text-indent:0px">> </p>
<p style="margin:0px;text-indent:0px">> This executable
should get also a --file command line option similar to</p>
<p style="margin:0px;text-indent:0px">> > the
ktoblzcheck executables.</p>
<p style="margin:0px;text-indent:0px">> ></p>
<p style="margin:0px;text-indent:0px">> </p>
<p style="margin:0px;text-indent:0px">> I have added
command-line options by using the code from ibanchk.cc.
Kindly</p>
<p style="margin:0px;text-indent:0px">> take a look</p>
<p style="margin:0px;text-indent:0px">> and suggest any
changes.</p>
<p style="margin:0px;text-indent:0px">> </p>
<p style="margin:0px;text-indent:0px">> Thanks.</p>
<p style="margin:0px;text-indent:0px">> Prasun</p>
<p style="margin:0px;text-indent:0px">> </p>
<p style="margin:0px;text-indent:0px">> </p>
<p style="margin:0px;text-indent:0px">> On Fri, 3 Jul
2020 at 03:19, Ralf Habacker <<a
href="mailto:ralf.habacker@freenet.de" target="_blank"
moz-do-not-send="true">ralf.habacker@freenet.de</a>>
wrote:</p>
<p style="margin:0px;text-indent:0px">> </p>
<p style="margin:0px;text-indent:0px">> > Am 02.07.20
um 22:54 schrieb Ralf Habacker:</p>
<p style="margin:0px;text-indent:0px">> > > Added
method bool AccountNumberCheck::existDatabase(const
std::string</p>
<p style="margin:0px;text-indent:0px">> > >
&dbname)</p>
<p style="margin:0px;text-indent:0px">> > ></p>
<p style="margin:0px;text-indent:0px">> > > This
commit contains unrelated space fixes, which should be
moved into a</p>
<p style="margin:0px;text-indent:0px">> > >
separate commit.</p>
<p style="margin:0px;text-indent:0px">> ></p>
<p style="margin:0px;text-indent:0px">> > I added a
related "removing trailing space" commit to master branch.
You</p>
<p style="margin:0px;text-indent:0px">> > can rebase
your branch on upstream master to get this changes merged</p>
<p style="margin:0px;text-indent:0px">> > into your
branch by using</p>
<p style="margin:0px;text-indent:0px">> ></p>
<p style="margin:0px;text-indent:0px">> > git fetch
origin</p>
<p style="margin:0px;text-indent:0px">> > git rebase
origin/master</p>
<p style="margin:0px;text-indent:0px"> </p>
<p style="margin:0px;text-indent:0px">Sh..., I am a bit late
to the game here. Ralf may have overlooked the following:</p>
<p style="margin:0px;text-indent:0px"> </p>
<p style="margin:0px;text-indent:0px">---8<---</p>
<p style="margin:0px;text-indent:0px">Ahh, but the bliss of
rebasing isn’t without its drawbacks, which can be summed
up in a single line:</p>
<p style="margin:12px 0px;text-indent:0px"><span
style="font-weight:600">Do not rebase commits that exist
outside your repository and that people may have based
work on.</span></p>
<p style="margin:12px 0px;text-indent:0px">If you follow
that guideline, you’ll be fine. If you don’t, people will
hate you, and you’ll be scorned by friends and family.</p>
<p style="margin:12px 0px;text-indent:0px">---8<--- <a
href="https://git-scm.com/book/en/v2/Git-Branching-Rebasing"
target="_blank" moz-do-not-send="true"><span
style="text-decoration:underline;color:rgb(41,128,185)">https://git-scm.com/book/en/v2/Git-Branching-Rebasing</span></a>
</p>
<p style="margin:0px;text-indent:0px"> </p>
<p style="margin:0px;text-indent:0px">Just wanted to let you
know about those drawbacks for future occurrences.</p>
<p style="margin:0px;text-indent:0px"> </p>
<p style="margin:0px;text-indent:0px">-- </p>
<p style="margin:0px;text-indent:0px"> </p>
<p style="margin:0px;text-indent:0px">Regards</p>
<p style="margin:0px;text-indent:0px"> </p>
<p style="margin:0px;text-indent:0px">Thomas Baumgart</p>
<p style="margin:0px;text-indent:0px"> </p>
<p style="margin:0px;text-indent:0px"><a
href="https://www.signal.org/" target="_blank"
moz-do-not-send="true">https://www.signal.org/</a>
Signal, the better WhatsApp</p>
<p style="margin:0px;text-indent:0px">-------------------------------------------------------------</p>
<p style="margin:0px;text-indent:0px">Q: How much memory is
freed in the EU by Brexit? A: 1 GB</p>
<p style="margin:0px;text-indent:0px">-------------------------------------------------------------</p>
<p style="margin:0px;text-indent:0px"> </p>
</div>
</blockquote>
</div>
</blockquote>
</body>
</html>