Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git rebase support #558

Merged
merged 3 commits into from
Mar 25, 2024
Merged

Git rebase support #558

merged 3 commits into from
Mar 25, 2024

Conversation

jkloetzke
Copy link
Member

No description provided.

Sometimes upstream branches are rebased. While this behaviour is frowned
upon, it is still necessary to cope with such situations. The optional
'rebase' attribute, if set to true, will cause Bob to rebase the local
branch instead of doing a fast-forward merge.
Copy link

codecov bot commented Mar 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.94%. Comparing base (3929127) to head (a979222).

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #558   +/-   ##
=======================================
  Coverage   88.93%   88.94%           
=======================================
  Files          46       46           
  Lines       14680    14693   +13     
=======================================
+ Hits        13056    13068   +12     
- Misses       1624     1625    +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jkloetzke jkloetzke merged commit b28daf1 into BobBuildTool:master Mar 25, 2024
11 checks passed
@jkloetzke jkloetzke deleted the git-rebase branch March 25, 2024 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant