Skip to content

Actions: CUAHSI/learning-gitflows-template

Collaborator causes conflict

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
5 workflow runs
5 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Link to instructions about how to show hidden files
Collaborator causes conflict #5: Issue #16 closed by lindsayplatt
May 30, 2024 16:35 18s
May 30, 2024 16:35 18s
Setup a location to store all of the training repos
Collaborator causes conflict #4: Issue #3 closed by lindsayplatt
May 28, 2024 14:00 13s
May 28, 2024 14:00 13s
Dynamic --> Static (migrate issue content into a new "course_instructions.md")
Collaborator causes conflict #3: Issue #2 closed by lindsayplatt
May 24, 2024 20:32 10s
May 24, 2024 20:32 10s
Add better instructions for working in the terminal the first time
Collaborator causes conflict #2: Issue #4 closed by lindsayplatt
May 24, 2024 20:31 11s
May 24, 2024 20:31 11s
Add instructions that add collaborator content & generate the merge conflict
Collaborator causes conflict #1: Issue #6 closed by abnerbog
May 24, 2024 13:10 14s
May 24, 2024 13:10 14s