Week 2 & 3 commits

[Ralf Habacker]

Am 04.07.20 um 10:57 schrieb Prasun Kumar:
> Thank you for this advice. Although, before rebasing, I did some
> searching and found about this rule.
> As I understood, since no one has done any work based on my commits
> yet, it was safe to do the rebasing.
> Please correct me if I am wrong as I have not used git rebase before.

We specified the branch, where the GSOC stuff is added, as feature
branch (explained for example at
https://bocoup.com/blog/git-workflow-walkthrough-feature-branches).

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.

Regards

Ralf

> On Sat, 4 Jul 2020 at 10:42, Thomas Baumgart <thb at net-bembel.de
> <mailto:thb at net-bembel.de>> wrote:
>
>     On Freitag, 3. Juli 2020 15:23:39 CEST Prasun Kumar wrote:
>
>      
>
>     > >
>
>     > > I added a related "removing trailing space" commit to master
>     branch. You
>
>     > > can rebase your branch on upstream master to get this changes
>     merged
>
>     > > into your branch by using
>
>     > >
>
>     > > git fetch origin
>
>     > > git rebase origin/master
>
>     > >
>
>     >
>
>     > Done. Thanks for the help with merging.
>
>     >
>
>     > This executable should get also a --file command line option
>     similar to
>
>     > > the ktoblzcheck executables.
>
>     > >
>
>     >
>
>     > I have added command-line options by using the code from
>     ibanchk.cc. Kindly
>
>     > take a look
>
>     > and suggest any changes.
>
>     >
>
>     > Thanks.
>
>     > Prasun
>
>     >
>
>     >
>
>     > On Fri, 3 Jul 2020 at 03:19, Ralf Habacker
>     <ralf.habacker at freenet.de <mailto:ralf.habacker at freenet.de>> wrote:
>
>     >
>
>     > > Am 02.07.20 um 22:54 schrieb Ralf Habacker:
>
>     > > > Added method bool AccountNumberCheck::existDatabase(const
>     std::string
>
>     > > > &dbname)
>
>     > > >
>
>     > > > This commit contains unrelated space fixes, which should be
>     moved into a
>
>     > > > separate commit.
>
>     > >
>
>     > > I added a related "removing trailing space" commit to master
>     branch. You
>
>     > > can rebase your branch on upstream master to get this changes
>     merged
>
>     > > into your branch by using
>
>     > >
>
>     > > git fetch origin
>
>     > > git rebase origin/master
>
>      
>
>     Sh..., I am a bit late to the game here. Ralf may have overlooked
>     the following:
>
>      
>
>     ---8<---
>
>     Ahh, but the bliss of rebasing isn’t without its drawbacks, which
>     can be summed up in a single line:
>
>     Do not rebase commits that exist outside your repository and that
>     people may have based work on.
>
>     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.
>
>     ---8<--- https://git-scm.com/book/en/v2/Git-Branching-Rebasing
>
>      
>
>     Just wanted to let you know about those drawbacks for future
>     occurrences.
>
>      
>
>     -- 
>
>      
>
>     Regards
>
>      
>
>     Thomas Baumgart
>
>      
>
>     https://www.signal.org/ Signal, the better WhatsApp
>
>     -------------------------------------------------------------
>
>     Q: How much memory is freed in the EU by Brexit? A: 1 GB
>
>     -------------------------------------------------------------
>
>      
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-finance-apps/attachments/20200704/01ba3789/attachment.htm>