Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

12_generate_custom_csv_file #58

Open
philipp wants to merge 59 commits from 12_generate_custom_csv_file into develop
pull from: 12_generate_custom_csv_file
merge into: Foodsoft:develop
Conversation 0 Commits 59 Files changed 426 +9527 -7121
philipp commented 2023-02-23 18:26:58 +01:00
Owner
Copy link
No description provided.
philipp added 5 commits 2023-02-23 18:26:59 +01:00
philipp force-pushed 12_generate_custom_csv_file from 928a02ed3f to 690ea875b7 2023-02-23 18:51:26 +01:00 Compare
philipp force-pushed 12_generate_custom_csv_file from 690ea875b7 to 895589c03d 2023-08-23 15:03:10 +02:00 Compare
This pull request has changes conflicting with the target branch.
  • .rubocop_todo.yml
  • .ruby-version
  • Gemfile
  • Gemfile.lock
  • app/assets/javascripts/application_legacy.js
  • app/controllers/home_controller.rb
  • app/javascript/application.js
  • app/lib/apple_bar.rb
  • app/lib/articles_csv.rb
  • app/lib/bank_account_connector.rb
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 12_generate_custom_csv_file:12_generate_custom_csv_file
git checkout 12_generate_custom_csv_file

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout develop
git merge --no-ff 12_generate_custom_csv_file
git checkout 12_generate_custom_csv_file
git rebase develop
git checkout develop
git merge --ff-only 12_generate_custom_csv_file
git checkout 12_generate_custom_csv_file
git rebase develop
git checkout develop
git merge --no-ff 12_generate_custom_csv_file
git checkout develop
git merge --squash 12_generate_custom_csv_file
git checkout develop
git merge --ff-only 12_generate_custom_csv_file
git checkout develop
git merge 12_generate_custom_csv_file
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
needs specification

   
nice to have

   
question

More information is needed

  
ready to go

   
refactoring

   
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
needs specification
nice to have
question
ready to go
refactoring
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Foodsoft/foodsoft#58
No description provided.
Delete branch "12_generate_custom_csv_file"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?