Conversation
I think having good issue templates where users can report their issue with the needed information can benefit this repository and help our users
Update issue templates
Update README.md
* bumping version to 0.6.3 * removed requirements_dev.txt * updated packages on requirements.txt * removing docs from master, so docs can only live in the docs branch * Fix mac issues * updated workflow (#54) updated workflow to use requirements.txt instead of requirements_dev.txt * updated importing tkinter (#55) * Feature property method (#57) * adding property:method * Add material characteristics (#52) * Add characterization for exisitng materials functionality * Tested add_material_characteristics and made fixes * changed truth check * Tested synthesis, works. Also, changed truth checking back * made boolean assignment a function * Variable for row input start * Version bump 1.0.0 (#59) * version bump to 0.6.4 * version bump to 1.0.0 Co-authored-by: CVilla17 <villac@mit.edu> Co-authored-by: Brilant Kasami <brili@users.noreply.github.com> Co-authored-by: Bora Dauti <boradauti@Boras-MacBook-Pro.local> Co-authored-by: CVilla17 <95596724+CVilla17@users.noreply.github.com>
Update base.html to fix merge conflict
* changed artifact name for MAC * updated requirements.txt to use cript==0.6.1 * bumped Excel uploader version 1.0.1
# Conflicts: # src/web/templates/base.html
| <link href="../css/styles.css" rel="stylesheet"> | ||
|
|
||
| <title>CRIPT Excel Uploader - version 1.0.2</title> | ||
| <title>CRIPT Excel Uploader - version 1.0.1</title> |
There was a problem hiding this comment.
10 commits; one line changed, I suggest highly to do rebase instead of merge.
There was a problem hiding this comment.
Can you tell me a bit more? why rebase?
|
It looks like you want to rebase develop on top of staging or master right? If I am correct, you just need to rebase your develop branch on yop of it and push --force. This way develop will be behind and the history will be clean. Or, if you don't like push force/rebase, why not cherry picking the "bump version" commit?
Sent from Outlook for Android<https://aka.ms/AAb9ysg>
________________________________
From: nh916 ***@***.***>
Sent: Friday, February 10, 2023 12:46:30 PM
To: C-Accel-CRIPT/cript-excel-uploader ***@***.***>
Cc: Berenger DALLE-CORT ***@***.***>; Review requested ***@***.***>
Subject: Re: [C-Accel-CRIPT/cript-excel-uploader] Fix merge conflict (PR #78)
@nh916 commented on this pull request.
________________________________
In src/web/templates/base.html<#78 (comment)>:
@@ -43,7 +43,7 @@
<!-- my styles -->
<link href="../css/styles.css" rel="stylesheet">
- <title>CRIPT Excel Uploader - version 1.0.2</title>
+ <title>CRIPT Excel Uploader - version 1.0.1</title>
Can you tell me a bit more? why rebase?
—
Reply to this email directly, view it on GitHub<#78 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/A2UKYZSN2VMQXEE66EMOXQ3WWZ5HNANCNFSM6AAAAAAUYBQXTU>.
You are receiving this because your review was requested.Message ID: ***@***.***>
|
Well I don't think I can because I dont have access to force pushing on any of the protected branches. My main objective here is to fix the merge conflict to push develop into master for a new release PR do you think rebase would be helpful here? |
Yes, If you had the rights, I think it would be easier yes, and the history would be simpler to understand. |
@bearmit yes, I would first need to first do a PR to fix develop, then a PR to merge develop into master. However, if there is still a merge conflict then I would have to do more PR's for the release I think you might be right, rebase is probably better because we have been getting a merge conflict a few times now when trying to merge develop into master for a release |
5 participants
No description provided.